-
-
Notifications
You must be signed in to change notification settings - Fork 34.1k
gh-144356: Make set iterator __length_hint__ and iternext race-safe under no-gil
#144357
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
setiter_len() was reading so->used without atomic access while concurrent mutations update it atomically under Py_GIL_DISABLED. Use an atomic load for so->used to avoid a data race. This preserves the existing semantics of __length_hint__ while making the access thread-safe. Signed-off-by: Yongtao Huang <yongtaoh2022@gmail.com>
setiter_len() under no-gilset_iterator.__length_hint__ under no-gil
|
Thanks for the review. I’ve decided to address both issues in this PR. I also added a corresponding test case for the issue you pointed out. |
| setiterobject *si = (setiterobject*)op; | ||
| Py_ssize_t len = 0; | ||
| if (si->si_set != NULL && si->si_used == si->si_set->used) | ||
| #ifdef Py_GIL_DISABLED |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This might work for setiter_len, but setiter_iternext itself is not yet thread safe (also because of setting si->si_set to zero).
For several other iterations the approach is to keep the reference si->si_set , but use another attribute to signal exhaustion of the iterator. For example for itertools.cycle or the reversed operator.
Note: I tried creating a minimal example where concurrent iteration fails, but I have succeeded yet (the example does not crash, although I have not run thread sanitizer on it yet)
Test for concurrent iteration on set iterator
import unittest
from threading import Thread, Barrier
class TestSetIter(unittest.TestCase):
def test_set_iter(self):
"""Test concurrent iteration over a set"""
NUM_LOOPS = 10_000
NUM_THREADS = 4
for ii in range(NUM_LOOPS):
if ii % 1000 ==0:
print(f'test_set_iter {ii}')
barrier = Barrier(NUM_THREADS)
# make sure the underlying set is unique referenced by the iterator
iterator = iter(set((1,2,)))
def worker():
barrier.wait()
while True:
iterator.__length_hint__()
try:
next(iterator)
except StopIteration:
break
threads = [Thread(target=worker) for _ in range(NUM_THREADS)]
for t in threads:
t.start()
for t in threads:
t.join()
assert iterator.__length_hint__()==0
if __name__ == "__main__":
unittest.main()
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you. I think your points make a lot of sense, and I really appreciate the two links you shared—they helped me get a more complete picture of the iterator-related data race.
I’ll try to construct the case you mentioned under a TSan environment.
If it turns out to be appropriate, we can address it fully in this PR, that would be great. Of course, this will take some time.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, we should fix this like we have fixed others and as Sam suggested only clear the associated set in non-free-threading builds. The current code is incorrect because it uses try incref which can fail spuriously if the set object is not marked to enable try incref.
Objects/setobject.c
Outdated
| Py_END_CRITICAL_SECTION(); | ||
| si->si_pos = i+1; | ||
| if (key == NULL) { | ||
| #ifdef Py_GIL_DISABLED |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should follow the pattern that we use in other iterators: don't clear si->si_set when the iterator is exhausted in the free-threaded build.
That will keep other things simpler.
eendebakpt
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I left some more review comments. I think we can get this right, but a simpler approach here would be to put a critical section on the set iterator itself.
Objects/setobject.c
Outdated
| #ifdef Py_GIL_DISABLED | ||
| FT_ATOMIC_STORE_SSIZE_RELAXED(si->si_pos, i + 1); | ||
| #else | ||
| si->si_pos = i + 1; | ||
| #endif |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| #ifdef Py_GIL_DISABLED | |
| FT_ATOMIC_STORE_SSIZE_RELAXED(si->si_pos, i + 1); | |
| #else | |
| si->si_pos = i + 1; | |
| #endif | |
| FT_ATOMIC_STORE_SSIZE_RELAXED(si->si_pos, i + 1); |
On the normal build the macro will expand to si->si_pos = i + 1;
Objects/setobject.c
Outdated
| #ifdef Py_GIL_DISABLED | ||
| /* free-threaded: keep si_set; just mark exhausted */ | ||
| FT_ATOMIC_STORE_SSIZE_RELAXED(si->si_pos, -1); | ||
| si->len = 0; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This (and some other places) should also be atomic?
Objects/setobject.c
Outdated
| else { | ||
| #ifdef Py_GIL_DISABLED | ||
| /* free-threaded: keep si_set; just mark exhausted */ | ||
| FT_ATOMIC_STORE_SSIZE_RELAXED(si->si_pos, -1); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The value -1 written here could be overwritten by a concurrent thread (at line 1155). Which means that over exhaustion of the set iterator it is restored back to life. This does not lead to overflows or other issues (afaic), but is a bit odd behaviour.
Objects/setobject.c
Outdated
|
|
||
| if (key == NULL) { | ||
| si->si_set = NULL; | ||
| #ifndef Py_GIL_DISABLED |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think in the normal build you still have to do si->si_set = NULL;, otherwise the si->si_set is decref'ed again in setiter_dealloc.
Thanks for the suggestion. I simplified the implementation by protecting both the iterator and the set with It looks like there is an unrelated flaky test case. |
eendebakpt
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@hyongtao-code Thanks for your work on this! The core idea of the PR has shifted a bit, which is why I have some more review comments, but we are getting closer I believe.
| Py_ssize_t len = 0; | ||
| if (si->si_set != NULL && si->si_used == si->si_set->used) | ||
|
|
||
| #ifdef Py_GIL_DISABLED |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we also set si->si_pos to -1 in the non-free threading build, then we can keep the code for the FT and non-FT the same I think. For the non-FT build we then set both si->si)set to zero and si->si_pos to -1 at exhaustion, but the code will be simpler.
Also the two code paths in setiter_iternext will be more similar then.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks — using a flag makes the code clearer.
Co-authored-by: Pieter Eendebak <pieter.eendebak@gmail.com>
This reverts commit 78241a8.
set_iterator.__length_hint__ under no-gil__length_hint__ and iternext race-safe under no-gil
| threading_helper.run_concurrently(worker, nthreads=NUM_THREADS) | ||
|
|
||
| @threading_helper.reap_threads | ||
| def test_iternext_concurrent_exhaust_race(self): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The test_iternext_concurrent_exhaust_race and test_length_hint_exhaust_race test slightly difference things, but I think they can be combined (to reduce pressure on the CI)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
something like this work?
def worker():
n = 0
while True:
if n & 1:
it.__length_hint__()
try:
next(it)
except StopIteration:
break
n += 1
Objects/setobject.c
Outdated
|
|
||
| #ifdef Py_GIL_DISABLED | ||
| PySetObject *so = si->si_set; | ||
| if (so != NULL) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the FT build so cannot be NULL. Remove the if (maybe replace with an assert).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks. I applied the same change in both functions.
Objects/setobject.c
Outdated
| si->len = 0; | ||
| #ifndef Py_GIL_DISABLED | ||
| si->si_set = NULL; | ||
| decref_so = 1; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can do the Py_DECREF(so); here and then remove the decref_so variable. (we are exhausted, so key is still NULL).
Long log:
In free-threaded builds, setiter_len() and setiter_iternext() could race with concurrent set mutation and iterator exhaustion.
We now serialize operations on the iterator itself (and keep the set stable) using a critical section, and ensure the iterator’s exhaustion state is handled consistently.
The non-free-threaded build keeps the existing semantics. Add free-threading-style concurrency tests (similar to the itertools FT tests) to exercise
__length_hint__anditernextexhaustion under concurrent execution.setiter_len()was readingso->usedwithout atomic access while concurrentmutations update it atomically under Py_GIL_DISABLED.
In free-threaded builds,setiter_len()could race with concurrent setmutation and iterator exhaustion.
Use an atomic load forso->usedto avoid a data race. This preserves theexisting semantics of
__length_hint__while making the access thread-safe.Signed-off-by: Yongtao Huang yongtaoh2022@gmail.com